Bug fix and edits added 2014-02-14