topology updates
fixed node draw
Merge origin/master