dev merge

enemy shooting fixed and other bugs squashed