fixed and addeed some comments