Almost there

Made some more bug fixes. Will try to fix attack speed later...
auto-attacks happened way too fast.