issue #62, #70, #73, #74, #76