major code reorg, chart changes, code cleanup, and sundry improvements