various fixes; content files split into smaller files