Merge new changes from main repo

Yay, More changes!