some fixes
some...