Add support for comments
Remove spurious returns
Use global state in gen_inc and push to it properly