more collection fixes, fixes #22, #21, #20