a few more changes for #140