initial parsing efforts
minor edits