tweaks, and fixed issues #69 and #68