another bunch of updates, down to 39 compilation errors