some changes, additions, edits