several changes

Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>