better comments, some theming