Merge pull request #42 from cassiemoy/farheen

Random bugs/edits
Merge branch 'master' into farheen