Adjusments

TODOs: Adjusts of dock in email
Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>