minor improvements, fixed spec