Updated equipment and magic modules slightly.