Cleaning and minor fixes.