little code/repo refactoring. Also patch small issue concerning the number of left places in the sended mail.