added code for rerun
added a bool to cfg to give rerun stuff
Merge remote-tracking branch 'origin/master'