Screenshots and some smaller modifications