Fixing little things in the project