Continued work on spawns and items