weapon definitions cleanup, fix lance name