Circles are socketified, few minor fixes