Several mods

Signed-off-by: Artur Tenorio <arturvt@gmail.com>