some fixes
mergeed