Basic Modifications.

Signed-off-by: Rafael Neri <rafepel@gmail.com>