some more fixes, nearly there
some more fixes, nearly there