fixed some of the other half