added support for akademia2 scenario (see lua hexameter for the rest of it), fixed some bugs