Rotates image based on track and some other minor fixes
Some commented code removed