Support for multiple comments and bug fixes.