more ch05 updates, including a few code tweaks... still in progress