final modifications and implementation

Final version of our project