add sane defaults and clean up spurious semicolons. (from AHP)