serveral cleanups for screenshots