A number of mapping improvements as well as other fixes and tweaks
Fixed an overload in the mappings I created by accident
Updated que and vit