updated collectors
fixed bugs in models