cleaning up, fixed print-outs in db