a bunch of changes

tidying up
grrr