In Progress

Fix some android bugs