Bug fixes, added validation, renames and general cleanup
Merge pull request #45 from SEL-Columbia/cleanup

Bug fixes, added validation, renames and general cleanup