Major fixes and edited gitignore