added hasData class
fixed circles, added fill