fix parser to handle space characters and more symbols