fixing somethings up