Updated verbose mode parsing.