clean up and fix firing