code & comments fix