Touched a few problem areas.

Made sure to clean things up.