merging fixes and changes