Last minute fixes

tidying up!