fixes and changes
fixes