tried to fix a few things