fixes for a few things

nothing really majorly wrong, went ahead and fixed the passwords thing while I was at it