tweak
flag fix
upgrade to link menu system