More documentation and cleanup 3.