~various minor changes/corrections