More content and fixes