parser added and few minor changes