Add "--now" option, make output more specific