Crear/merge/cosmetics

Mostly look and feel, some rewording.