Updated for XE16 and commented code

Known issue: BadTokenException when invoking a menu. Currently looking
for a fix.