Added Firing and Fixed Bugs