Some small changes to make the project working