some fixes
even more fixes