CORE: bunch of TP changes I missed in the last update
Merge branch 'master' of https://github.com/DarkstarProject/darkstar