rework nas structs, clean up geral