Design feedback and fixes.

Signed-off-by: Waldemar Figueroa <waldemar@nobox.com>