Migrate to android-studio and also many bug fixes