finishing up callback fixes