Renamed Either's Match to MapEither and other small changes