Added two new enemies, tweaks, refactored alot