Lots of updates, some from magnars