Restore skipping nodes with only one child

Clean up code from junk comments
Fix indentation
Evaluate method connecting nodes for proper order

getting rid of these fixmes