Some fixes and amendments- primarily to build.gradle