fix a couple minor bugs
adds sad missing semicolon and comment for clarity
Merge branch 'dev'