fix stuff I think