include curb, + syntax and other fixes