change to android studio, further enhancements