Clear project with fixed bugs