User/developer clarifications and other minor changes.