consistently scala.collection.Map insteadion of scala.Map (because fuck you scala why are those different?), and bumped version