update on #92 and other issues