added yash links and functionality tweaks