more modifications based on github issues