Remove -s option, main command now toggles timer.