bug fixes resulting in crash of hilbert functions when using columns as parameters
merge