some fixes
some more updates