Fixed and broke stuff