Added Tynt; Bug fixes