Types fixed and linkes added