Minor changes and edits. Error on multiple run still present