Fixes for UniA-Z, added Mensa (WIP)