Crear/merge/cosmetics

Mostly look and feel, some rewording.

<!---
@huboard:{"order":10.0}
-->