Minor enhancements...and some bug fixes.