hack in support for comments and flags