Added and cleaned up kernels