mechanics changes & bug fixes for movement & fight