Added basic map selection, improved hyperspace