integrate sgran's fixes