Even more updates

Missed a couple of things that needed cleaning up.