Cleaned and minor fixes.