more screen grabs and cleanup