more update and cleanup.