misc updates & gradleization