Clean up a bit ... getting to the point where things are mostly working!