some fixes
fixes