cleaned up a bit. ready for github.