Fixed firing stuff, closed #78, closed #79 sort of