More bug fixes, expanding underscore in question.