modal and comments fixes