final fixes taskoverview phase1