need to fix a few things