more fixes, improved spawn locations