fixing the last remaining syntax issues