trebuchet fixes
Merge pull request #11 from gandhar/clean

trebuchet fixes
Thanks, gandhar!