reverting change to vanilla build.gradle
fixing minor issues