Fix credentials + comment fixes