More answers and cleanup.