Control.g branching logic is now correct (I think), also small changes to Node.java and some iloc files