gradle script upgrades
some minor cleanup