minor fixes, nearly there