misc changes

Signed-off-by: Orlando Melendez <sherlack@gmail.com>