some fixes
stuff