conceptsx diff is hard to deal with

https://www.diffchecker.com/23jqeh66 everything's been reorganized, and all the previous credits removed. It's going to take a while to pick through this. His version is significantly (~500 lines) shorter even discounting dropped credits, which is concerning. May just be that I added a lot, but doubt it was that much.
