A re-factor, mainly fixing things I found after integrating with yeopress