quick tidying up commit, had to 'stash' some stuff earlier so I couldget back to a clean state without losing changes. dealt with changes introduced by stash retrieval. should be up to what last commit was supposed to be