Updated some combat. Still buggy