- few fixes and tidy ups