support comments in more places