added UCI service update handler; misc fixes and CMake fixes