checking into github. minor improvements but more work to do