More fixes/improvements to make.