Fixed a couple of bugs
Updated .gitignore. Don't know why I didn't do that sooner