fixed some consistency issues