minor Parser changes and more