Bug fixes, and commit for friday meeting 4_25_2014