fixes stuff