updates and fixes
fixes