adding remaining tags

For #20. Also removed unnecessary empty object state now that we have the arguments defined on the parser.