Enemy actions w/helpers, minor bug fixes, some modularization
Resolved refactoring/modularization merge, rectified refactorization slips