Added textarea, few fixes