Cleanup!
cleanup / more debug messages
manual merge wcummings cleanup