fixes for issue 33 items 5 and 6