added new opts
more consistent completion messages