Cleanup on a few things.
Updates