Tag autocomplete, markup buttons, some inner improvements