Dev

Updates EE compatibility and merges some other changes we've made previously