bugs fixed , token parser added