SeeD tweaks. Issues 1 and 2.
Fix conflicts