More cleanup, fire parameter added to spawn at users feet