Fix shit
Fix more shit
Merge pull request #1 from turt2live/t2l-hook

Merge turt2lives stuff.