started fixing collections for issue #11
fixed issue #12