Minor fixes
merge
Dj working algorithm