Fix some bug and added some features

...and added remove junk file.