Some readjustments to my modified source files