Added verbose mode, more options