bring some things up to date
Add %push and %pop directives