slight changes of comment section. not fully developed yet.