Changes in the whole project

- bugs found fixed