Soem tweaks and markign roders as [un]fulfilled