various commentary bug fixes