major edits
Small changes