FunctionLibrary - still improving. Bugfix.