WIP: Map port, update lua file and fix typos