some minor improvements.