add verbose option and a couple fixes