Usability improvements. Thanks to gr4z and Cicilia