fixed some case issues