updates to various posts
resolve merge conflicts