Sort out my reference errors. Cleaning up a bit.