Various updates throughout, including some updates per enhancement issue #597