Added more tools to help with Groovy classes. Other minor tweaks