All working!

Final update. Some mistake somewhere maybe but results seems good.