fixed some where...