Updated Gradle Settings, misc other updates