some fixes and typeset