Woops

Sorry to flood you with commits guys, couple other small changes to
make. These have been made, and the whiteboard is ready for final
dressings.