some fixes
todo