added some features, fixed some features
finalized the project