Minor changes

Small updates and fixes throughout parse.cpp