little improvements sugested by juvenilda