Fix bugs all over the place that weren't calling merged options. Get serialize to work properly.