updates
some fixes
bug fixed