Fixed soldier spawn in obstacles

And minor bugs