moved `with-display' macro and uncommented screenshot code.