mas bugs corregidos

Signed-off-by: areikusu <aleix.casanova@gmail.com>