updates to screenshot class
more reorgs