Added changes that should have been added a long time ago, so much I don't even remember