Fixes a disguise bug, as well as a few other bugs