some file cleaning and minor changes