Revert "Revert "Fixed spawning""

This reverts commit d5ee371ad9e8299f7c9aaeaaca24ad099b6b236a.
Revert "Revert "minimap fix""

This reverts commit 750f8b5be9d0f125b031320bd20a7a67734914b9.