[0.97] Fix Bugs and Add Delegate points