Trackinfoobject clean up

These changes are some minor improvements and clean ups. These where unmerged from daschuers trunk for long. See commits for details.