Various fixes to the engine...
Track file format fixes...