Fixed attribute node issues and tweaked leader node a bit