General fixes to the code
Signed-off-by: Lucas Manuel Rodriguez <lucarodriguez@gmail.com>
Some changes
Signed-off-by: Lucas Manuel Rodriguez <lucarodriguez@gmail.com>