Small Fixes and added basics to a create map option