fixed some compile errors just gotta pass final tests now