updates to various sections
fix conflicts in merge