I'm happy to contribute! Thanks for highlighting the tagging inconsistencies; I think I've addressed them for the most part in Changeset: 155992111.

https://www.openstreetmap.org/changeset/155992111

Happy mapping!