Additional documentation and cleaning up.