addressed some consistency issues