-some more fixes