update on answer and other patches