Small fixes and commenting out old code
Merge branch 'master' of https://github.com/Scionar/TiPi