comments, fixes