some minor updates to work around issues #53, #54 and #55