markdown and unicode issue
clean-ups
rebasing