fix syntax issues and required include