Changed some things, added some stuff in .gitignore