Bug fixes, correct enemy sprites during combat, and other minor changes/fixes