comment & startup fixes