Completed node types.

Also updated input a bit.