cleanup; short failed call message; small layout cosmetics