Pushing my final fixes for the android project