Changed some map stuff

Fixed ingamemap?
Commented out shiplayout generating random map when run