Android studio upgrade
Fixed a few bugs