simplifying pools/assets and fixing collection