fixed some  more