Tweaks, still 4 drc errors