Fixed stuff that was making it not work in android studio