general updates and fixes