Finished a bunch of shaders, tightening up combat now