Add domina to dependencies, small cleanups