run against self and more tweaks