modified footer, refactored macros
new push