merge pull request from Kyrre (several improvements to code structure, bug fixes)
merge pull request from Kyrre (several improvements to code structure, bug fixes)

SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack