this fixes a few things