Merge in improvements