alguns bug fixes / clean up nas structs