Add missing quotes, etc. Change log prefixes etc.