And fixed! To my own satisfaction at least.

//