Improves pre-processing, adds new features