Neutral object fix, tweaks and initial special