Remove need to be Node 1

Plus lots of tidying up.