little tweaks on the way to solving issue #99 & #100