Some updates, cleanup