minor fixes & comments