added login for stop waving, slightly better messaging