Bugfix: Fixed iterator, added missing function.