fixes & comments