lots more tidying, starting to feel respectable