Fixed map being called too early. Readded --type to the command line