changing unit tracking
added error msg to bsc info
Merge branch 'master' of https://github.com/MazMachine/Coen174