mq fix, text, desc and notes fixes
merge dev