Commits


more changes


various cleanup


Thanks to John Cummings.