some cleanup, and fix minor bug in dagreader from previous commit