Some fixes & changes
TextInput enhanced