more tweaks
[#15]