Fixed still more after effects of illconceived merges
Partial markup validation + fixes