Handful of fixes, spawning improvement