minor changes
better text cleaning
merge