script edits
merged
small changes
fixed onebody contribution