More fixess.

this is endlesssss