Add note support (unparsed comment)
Fix handling comments at the end of file