Minor fixes & comments