macro and include update, very minor