- some minor enhancements and bug fixes