fixes to address issue #120
more polishing