Updated some stuff
Moved fire from function/background to main loop