some fixes
fixed