further changes
changes commited, although simon has fixed everything