New training data, small fixes and cleaning.