fixed bug with attacks - attacks should now work properly (to an extent)
finished merge