more editing, thoughts from discussion with Markus