updates, cleanup