more content and fixes