fixed everything up