selenium tests turned up 2 logic bugs.
Merge pull request #58 from ccnmtl/selenium-update

selenium tests turned up 2 logic bugs.