fix some shits now DONE