bugfixes, print markup changes