Everything in this branch is back in order

This time I won't merge it myself.