Expanded comments and better handeling of new sources