WIP

More of the same changes; missed a few this morning.