tweaks and fixes

Signed-off-by: Bruno Gaspar <brunofgaspar1@gmail.com>