Corrected --no-state option and help for status