Adding many fixes
Versification mapping fixes