Some cleanup and update gitignore