WIP: target save now updates setup flags