Port to 1.21.1!

Several bugs have been fixed, but there will still likely be some. Please report any you find on Github!