bug fixes

still missing on 34, and 64