Cleaning, reordering and adding of some new stuff.