Small changes and cleanups.. remove remaining commas and refernces to csv files.