Added auth_password, fixed some minor issues