Random fixes, added battle class