Corrected comment handling, now 3 different comment positions are possible (and can be combined).