merging in shooter code with less bugs