bug fixes + add partial framework for presenting comments