More node fixes

Styling mainly