Updated a bunch of stuff related to swapping