Fix bugs and text added