More progress on Defaults and Options