fixes + weapon update