cleaned up some code and fixed all the console errors
Merge branch 'eugene'