Add verbose mode; limit baseline option