Misc fixes
Turn calculations
Merge branch 'master' of github.com:anidev/612-2013
hard coding some autonomous stuff