DocBlock fixes
Split out UCP event listener
Add some effectively installed checks
Minor coding improvements