A lot of core changes + comments