Bug fix related with uncertainty matrix, and new preprocessing scheme