Removed more gpatches, basic splines workingish