opencl updates
merge cleanup