Fixed shooting bugs. Some refactoring.