Some small fixes. See comments in pull request
Ignoring IntelliJ IDEA project files