Bunch of improvements. Basic combat is working.