Fixed many small issues across the project