Reworked shooting thing a bit
Some more fixes