much improved comment parsing