updates, clean up