last commit for tonight, tidying up a little.