little more fixes