Troutfixes

Fixes #2, #7, #9, #10, #12