Clarify and fix some stuff