fix parsing issue and minor changes in the last 6 months