Improved the project manager and fixed a bug