Fixes t3home13

A bunch of fixes and cleanup tasks. Works for me now. :)