added main files
fixed some bugs, changed the name