Re-added a few missing checks
Upped version number. May eventually externalize the numbers and setup
to auto-increment.