Initial commit
add again
fix some bugs