fixed & comments
fixed & comments