Further tweaks to fix dimness, I think we're ready to merge...