more testing and rebustness changes