update from server, clean up, update gitignore