speed up gradle, fix piece positioning, tidy