Some updates and cleaning up.