Fixed build.gradle and other glitches