try to fix a few things