Update: yoshim queue fixed, non menu added.