new functionality, and fixes/improvements