implement feedback from Kelley

Loads of small fixes. Any more? Push to this PR or tell me here or on mail... Let's move this live next week or so, nothing is urgent in this one.