minor improvements/corrections