Updated and fixed pieces of the project