Corrected parsing error and other minor edits

Corrected parsing error and other minor edits