fixed up everything