parser workings are tested somewhat and fixed