a few minor changes that helped things to work better for me