fix issues according comments