fixing and breaking a few things