Work on #1 and #11 (Comment related)