general updates and fixes
general updates and fixes