bug fixes for android app