Lots of updates to source files