various enhancements + fix #74