fixed a lot
fixed a lot...