add some fixes
add some fixes
add some fixes