Many minor improvements to UglyBot