chain calls
fix trace message
cleanup