fixed some of it