Add -v option, remove debugging statements