Additional cleanup and work for Android. Need to stop myself from working on multiple platforms -- it slows down progress