Code cleanup
Script fixes
2013 fair updates