Fix #3, #5, #8 (node orphans & degree related)