Trench Face: Bug Fixes

A few more bug fixes Let me know if you encounter any that need attention Thank you!