fixed if/else, token fiddling, + sample c program