Graph scaling  & some cleanup