Additional messaging & cleanup.