various fixes regarding comments