final fixes in Super mode