cnat: maglev fixes & improvements