minor improvements/fixes