UCJEPS-461: fixes and enhancements, now feature complete...