Fire done
Big cleanup
Code improvements, new bullet and bonus