fix pendig comments / issues