Movement and weapons fix