Several bugfixes
Updated android gradle plugin