solving some bugs
data collected