small fixes specially on diagrams