Bug fixes
Bug fixes complete
Android bug fixes complete