fixed misc stuff
Merge branch 'master' of github.com:vogievetsky/FasTrack