fix'd all the things