Small fixes and tweaks regarding options
Fixed gitignore