Cleaning up some Corona hacks (fixed in most recent public release); WIP for disjoint set (with delete) data structure