Fixing some things and password in them