Tweaks to spawners. Getting close to a finished state