Tidy up messages more and fix camera URLs