Demo ready, bugfixes, including current apk