fixed some ugly things