better comment handling!