Additional content and fixes