Fixes for #1602, #1655 & #1673 also update .gitignore to ignore WebStorm/idea