some fixes and tweaks, refs #124