add exception, doc types fixes