fix bugs
add additional files