added comment functionality, sorting, etc.