some fixes
changes