addressed new bugs (in issues on github)