some updates and fixes
some updates and fixes