Some changes. And stuff I can't figure out