shooting bugfixes & improvements