Minor modifications

+ New macro generator for longer sections