Fix setting of properties and flesh out comments a bit.