some fixes
fffff