bug fix ... now all options are handled

Push and POP was not handled previously