Bugs fixed and textarea added