changes

more bug fixes