Fixed some stuff more to do.