second commit

fix bugs
add new files
change Array to Vector