latest apk pushed to repository

(+minor code cleanup)