Removed accidental keys, and revised some bugs