chptrs 1&2 organization tweaks