Lots of bug fixes to get CircleUp working.