More logs and handle topmost case

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>