More lua-ish, shortcut menu implemented, assorted bugfixes