Got rid of most of the magic numbers + added some randomization to gun fire