closes #272 also, updates dependencies and starts work on #170 also cleans up code some Signed-off-by: androidacy-user <opensource@androidacy.com>