terrplant updates for ubertool object
sprint 7 wrapup
sprint 7 merge cleanup