tidying up before a pull
merging files to accept Petras updates