bugfixes and added Android