end of week merge for last week, this week

moderator things, and a little server tweak