fixed some uglyness