Making rapier more weapon-like