more fixes... things seem to be coming together
more cleanup
more updates