Fixin some stuff!!