fixing broke stuff