big update, small edits to follow
big update, small edits to follow