fixes according comments