fixes and updates
fixes and updates