Multiple fixes and a bit of new content