fixes and typeset