Update feature: Comment markup and header fix