bug fixing and updated antlr file