Tools rework; adamant sword added