fix bug (inversion) in both kernels
file cleaning (warning mainly due to Serialization)