Fixed some bugs and Clarity on Text