Adding final content and fixes.