add context menu and some correctifs