Added spawn location + some other stuff