#2: Smaller bugfixes
#2: Smaller bugfixes
#2: Smaller bugfixes
#1: handle deleted nodes better