fixing up everything