Various fixes to address minor details noted by my committee.