updates and fixes
more fixes