more follow fixes and trace