Moderate code cleanup
More degreeking
Fixed fire placement (previously square roes/cols were mixed up)
Merge pull request #2 from Vhati/master

Update