Fixed comments, added intermediate file cleanup.