Updated Gradle, etc and bugfixes for reported issues.