Fixed up everything