some fixes
add log back
add log back