Add verbose mode + small bug fix