Few small tweaks to finish link module YML fix and auto message change t...

...o only while streaming, Please check the changes and I dont mind if your not happy with them :)