Preprocessing is more strengthened.
Several bugs are fixed.