A few more tests, some bugfixes, better number formatting, apk