Various improbements and consistencey changes.