- even more fixes