Fix for more things some stuff temp and stuff