Some corrections, including fixing of an incomplete source file