hotfix
close #209
progress on #203, #169, and #207