Merge pull request #6 from tnason/master

update my junk
Merge pull request #7 from tnason/master

another pull
more track rendering fixes
Merge pull request #64 from jamesclampffer/master

some rendering fixes