added multiple map types and marker placing