Final Commit for 2013-2014 School Year

small fixes