updated project with some fixes