fixes and gradle first shot