Fixes & comments.