fixes
Fix domain bug
more dependencies
merged