fix & comments