minor fixes

take care of #36 #182 and potentially #201