More documentation and cleanup 4.