completed sections
merge into master plus compatibility updates