first commit
add several fixes