Fix Bug & Complite the project