Make push resolved a function so I can't accidentally -f it. Also update dictionary and some emacs indentation.