Better, faster, stronger!

bunch of improvements to fix previous mistakes.
Merge branch 'master' of https://github.com/HailZaros/PP-Tracker