tidying up files and various bits