- few more minor changes. I really need to document these over the weekend