Added support for both single line and multi-line comments (Java style), minor test bug fixes/updates