fixing a few things
reconciling versions