hopefully fixed a few things