trying verbatium again
couple of small fixes