reorder and fix spelling