Added: fill() term, sub() overload for geometry, minor fixes