A bunch of misc. fixes, adding markup elements