Make makeglobal smarter when aligning things
Add buffer structure