Rename stuff, fix some bugs, add GeomUtils