Fixed loop to merge defaults and options (like a baws)