Some fixes. With parsing