enable send button, bugfix and tidy