Add verbose flag and some minor cosmetic changes.