fix tab
add workaround
fix some comments