Some markup/syntax problems
merge