Reorganization, rename shortcuts, typos, etc.