bug fixes: comments