Fixed a bug with enemy attacks
Merge branch corrections
Merge Fixes continued.