All the parsing changes we dicsussed

Hope i do the right thing...