lots of fixes
more updates