various cleanup and addition of gradle wrapper stuff