added comments and analytics
comments now available via yaml option