some minor improvements/corrections