correcting comment support, updating test and documentation to match