moved some stuff relating to FunctionDefinition
fix for 2Pi node (#559)