(1602, 1655, 1673) - Minor bug fixes

Also threw in .idea/ to .gitignore so WebStorm files don't get checked in.