more changes

modified lots of files