make things mostly working