Trenches updated with bugfixes

Trenches