Some refactoring / signature changes Fixed #6, Branch and ForRange nodes working