some fixes
backup