Fix status, add more options and maybe more.