Trebuchet Fixes and Updates