minor improvements 158