cleanup and add screenshots