Corrections, improvements, new files