changes to some files and fixes