Add omni config, fix a few bugs.