Large update and a lot of commentary