Fixes and tidy-ups. Add continuous looping to image display.