Better docblocks, Ordering restructure, more order tests and fixes